From: Kenichi Handa <handa@gnu.org>
Date: Sun, 16 Sep 2012 16:18:23 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~2326^2~726
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=0b97c030c678e7c77766e13e615ef2ce8394860a;p=emacs.git

merge trunk
---

0b97c030c678e7c77766e13e615ef2ce8394860a